This should probably just be universally enabled.
rebased onto 906de7f7722ea9346e8df13067b6468648c7c9eb
Updated to enable everywhere
Pull-Request has been merged by ngompa