Initial changes for stable/1901 branch