I assume this is WIP related to #306. If so, it would be best to keep it in a separate branch and not merge it into develop.