Merge "Move up the check if the editor belongs to the current user" into main