Merge commits from master to st2 branch