Imported fixes from stable Ember v130xx...

Lates fixes from me and redglory