* changes: [automerger skipped] Merge SPL-2019-02-05 skipped: 7e11afc4 Merge SPL-2019-02-05
mentioned in commit e1eb4c9e