Merge SP2 to SP3 in order to port #109

Instead of cherry picking the commits, like in #110, it is better to simply merge the fix from the more stable branch (Code-11-SP2) to this branch (Code-11-SP3).

The list of commits that GitHub produces is scary, but that is only because we have been cherry picking instead of merging. We have fortunately cherry picked diligently, so the "Files Changed" diff corresponds to #110.