Merge changes from topics '644', 'improve_unix_permission_check'