Merge spl-2020-12-05

Change-Id: Ifc014e649f96d89d21eac6facb63eaf9941666dc