misc: Initial changes for stable/2101 branch