Model updates and preparations for shooting
Merge origin/master