* changes: [automerger skipped] Merge SPL-2019-02-05 skipped: 796a0b5b Merge SPL-2019-02-05
mentioned in commit 960728be