[Jaws_ORM]: tail of last changes
[Menu]: Applying new changes in Jaws_ORM