Merge "Fix bug where certain callback methods were not called."