Merge "Moar Content capture improvements:"