Merge "Ensure that the action views are always updated." into oc-dev