Merge the callback solution from branch remotes/origin/kamal