closes #830 (closed) closes #823 (closed) closes #833 (closed) Please see Merge request in core before merging this.