[DO NOT REVIEW] Fixes #6848,BZ1124547 - Checking content view environments