Merge pull request #3513 from mikem8361/soschanges