WIP Implemenation of #1725


WIP implementation of https://github.com/emberjs/ember.js/issues/1725

let the discussions begin.