Add context_omega module
Merge branch 'f-omega4' into dev
Merge branch 'dev'