Merge "Use existing callback ID for recurring callbacks" into devel/master