Lcg/drop 1.9 support