Merge commit 'origin/gallium-master-merge'