(S7v5-69) Interim commit of code.