Merge from branch 'dev'.