Merge "SF: add first trunk-stable flag" into main