merge 'security password' branch