IN PROGRESS MYG000-15 - Add test case and cases.
Resolve merge.
Fix merge
fix merge2