Merge branch 'fix/admin-controller-atom-leak' into 'develop'