a little bit more CR fixes
merged
merge changes conflict fixed