Adding enhancements from <downstream project>.