Camera in proper location
Merge branch 'PreCookie'