adopt changes after last master-merge