Integration with 4.0-rsp-up.0, regex fix, non-collapsed sub menus