Merge spl-2020-12-05

Change-Id: I3ff606455483bf2025ced6baa9936c8cb2c67317