Merge "blast: fix registering callbacks"