misc: Initial changes for stable/2106 branch