manually finished merge from 'master'