Commit By Pound edit QC1 30/12/2557