porting conflict fixes from n branch back to master
bumped version with conflict fixes