Merge commit '7937464319133d478d5e8b386e9d08668eddd8a9' * commit '7937464319133d478d5e8b386e9d08668eddd8a9': More on issue #2271640: Fix wallpaper etc docs
Merge commit '7937464319133d478d5e8b386e9d08668eddd8a9' * commit '7937464319133d478d5e8b386e9d08668eddd8a9': More on issue #2271640: Fix wallpaper etc docs