changes to be merged to master repo