commit after merging from trunk