This setting no longer needed & causes warnings if left in
Merge branch '1.10' into 1.11