Merge SPL-2020-02-05
Change-Id: I0f6eb5926e02575f44b7a9469db8cd9a9156ed91