Merge "Correct accessibility check for current user"