commit from work
after-merge fixes