Merge SPL-2019-12-05

Change-Id: I16fd99e0a0717e07cfe717122ddea57b513ce98c