Merge spl-2020-11-05

Change-Id: If65456d19df7738107e69a05146cb96e009d3f30