Merge pull request #927 from jeenu-arm/state-switch