merge additional camera patches by seadersn