[ticket/335] Resolve merge conflicts when merging master into develop

Fixes #335