back port latest folsom changes to folsom branch