[Issue #360] [WIP] fixes merge conflicts with master