* commit '5107eea64e46b0fffbbbcefa469a88044f309de6': DO NOT MERGE Add support for background scanning