[FIX] portal_sale: missing closing tag in b9275da during forward-port
[MERGE] Forward-port saas-3 up to daaef17
[MERGE] Forward-port saas-4 up to 847c7c8