Originally slated for the 1606 code base (now master). Should be rebased prior to merging into current development line.
