prepare for merging with master/3.0