Fixed issue with removal of custom actions
Merge branch 'master'