Merging changes from Production L1 Purchase