Merge branch 'omni' into kitkat