Needs further testing and documentation, will provide a more detailed commit message when that is checked in.