Merge "Ignore access from a different user" into main