manual fix the rebase conflictions, due to brand new file introduction (not merged from version of previous release)
