Initial changes for stable/1801 branch