Main small nx

Merged David David requested to merge main_small_nx into main

Merge request reports