Merge ActionManager improvements - updateStatusOf: