Sync changes from ST2 branch