Finished more TODO
Merge remote-tracking branch 'origin/bleeding-edge' into bleeding-edge