Merge SPL-2020-10-05

Change-Id: I1975a7728274c88ebffeac6401630cdf9b357a28