Merge SPL-2019-07-05

Change-Id: I00781c96be237a526aadb8d7e9e1221a12cd3b1c