catching up to 4.4.4 and other CM changes