Update from 'dev' branch.