Applying fix of Camera Session
Merge branch 'engineUpdate' into develop