* changes: [automerger skipped] Merge SPL-2019-02-05 skipped: 538b04ea Merge SPL-2019-02-05
mentioned in commit 6ce606e5