Merge "Fix incoming callback and binding issues." into klp-dev