[MERGE] Merged ADO's branch for the fix of partial picking getting failed while produ...