Closing as a dupe of 1656597 as sat is no longer targeting this for 6.5. *** This bug has been marked as a duplicate of bug 1656597 ***