4.8.12 & merge camera modifs