Merge branch 'dev' into nxl/background-subagents