Updated with v1.12
Updated with v1.12.1