Merge SPL-2020-06-05

Change-Id: I03e89a098a8d95523ee1a8364eab0168cd0760fd