master fixes

test to PR changes done recently