Merged work: fixes/enhancements