US51656: Merge latest changes from Rally