merge from 6.0 -- probably some portions are broken, please help to fix your sections