Merge "Fix (mostly) issue #5109947: Race condition between retrieving a..." into jb-dev