[v7r0] BUGFIX: wrong imports