[f21/master] Install optional product and updates packages (#1155228)