do not merge - core review 9/6