Fixed Issues from Build 18738