Merge platform commit #1742