Merge changes from topic 'security'