Merge branch 'main' into nx_support