Merge pull request #9377 from crdlc/bug-865197

Bug 865197 - Follow-up 861846 - Unit test fixed and added a new one r=julien