Feature implementations to match the master head.