Merge "Bind with the correct action" into oc-dev