SOAP-1769 Files not included in last commit, for whatever reason.