Merge SPL-2020-11-05

Change-Id: I48b3c896b01e96a473153ac42566cae2bd2c0c6b