Merge "(Automated Tests) Sync after stencil/depth buffer changes" into devel/master