Merge "Handle frontend callbacks"