Another move changes, preparing for merge to master branch.