Merge "Fix issue where pulse callback would be delayed"