Fix invariant_fields mechanism
Merge branch 'dev' of git://github.com/novius-os/novius-os into dev