Merge branch 'master' into sru_2_0