Merge branch 'feature/asyncAppMachineState' into develop