UAR-625 - Adding foundation files.
UAR-625 - Adding modified code that completes this enhancment.
UAR-794 Merge feature branch 'UAR-625' into release