Merge branch 'revence27-master'