#1486 More Safe Spaces & More Octagons