Requires Core 1.3.6