( Old version of this merge request: !323 (merged) . The old changes were reverted when merging !327 (merged) )