Compliant with contrib 0.11.2