This commit was SVN r18191.
Not functional yet - still under development. Just placeholding for now to clear a backlog This commit was SVN r18062.