Manual merging of original contents in master before forced merge from SDD branch to fix previously-erroneous merge by partner.