Work done while building for 2.10, which is not specific to 2.10