Merge branch 'verp' into 'master'