Merge SPL-2020-06-05

Change-Id: I7b04d2ee6e9d509be155741999e3a789cc884157