updates after merging with trunk