Merge "Change typehint callback to callable"