9924 – Add extra checkout fields