Merge 'master' based on code review