Merge "Execute pending transactions after FM state change." into oc-dev