Merge branch 'from_public/master' into 'master'

From public/master