[ROUTINE MERGE] From Production-Nov 27