couple lagging updates
Merge master into activecell-branding branch