[BZ 1100278] system setting cannot be null
Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63