Background generation update
Merge commit '7c2e563a71ad94a6d6ba5accc7240fb14bfbe0a0'