Initial changes for stable/1904 branch