onResume beta
on mac !
Merge branch 'feature/onResume' into develop