backported fixes to ST2