Rollback last commit overwriting const_ changes
Merge remote-tracking branch 'origin/master'