Merged in ember project