0226141053 - MergeBot - Merging packages/apps/Settings from upstream sources
amend last merge
Merge pull request #1 from cmbroms/kk4.4

amend last merge