Merge "Fix race condition and disable call." into jb-mr2-dev