[D675] reworked code and updated files for checkout shipping first address scenario