Switched back to the old function
Merge remote-tracking branch 'origin/master' into levi