Merge SPL-2019-12-05

Change-Id: I4a2d97ad06281048624630a8ce5d63cec335f9dd