Merge "Improve behavior of bg check."