Avoid dependency for menu include in imports test
Added DEVIATION comments
TODO: Use different name for legacy_scoping
Added support for @while