Merge all-complete-callback into master