merge with 1.11.g