merge dimitri updates