Import of v5.1.11 code base