Merge branch 'protected_getActionName' into develop