Back port fix & changes from main to keep licenses compatible for all releases: - 675aa86ca6 - 9f0043b8d6 - 81025eabd2
675aa86ca6
9f0043b8d6
81025eabd2