Changes to be reverted
Merges branch 'master'