Merge ekmett changes