st2 branch proposed changes