merge changes to folsom branch