merged changes in controls, block