Merge remote-tracking branch 'mst/tags/for_upstream' into staging