Catch & patch trimming
Merge branch '1.11' into 1.12
Merge branch '1.12'