Merge branch 'sf2.4' into menu
garbage collection
Merge branch 'menu'