Content overrides for 3.1.1