Merge remote branch 'origin/gallium-st-api'