back merge of latest master to CORE-team