* changes: [automerger skipped] Merge SPL-2019-07-05 skipped: 7404a231 Merge SPL-2019-07-05
mentioned in commit 55bb3e47