changes to be compliant with trunk for reintegration