Return errors via callback from lib
Merge branch 'master' into builds
7.575