post-merge fixes #2
post-merge fixes #3
post-merge fixes #4
post-merge fixes #5