A bit more upmerge
Merge remote-tracking branch 'origin/master' into APimenov_develop
Moving rgb192 buffer functionality to core