Merge "Change to <product>-<release>-<variant> form" into main