* changes: [automerger skipped] Merge SPL-2019-02-05 skipped: 787cba35 Merge SPL-2019-02-05
mentioned in commit fe6e1caa