ngsCAT compatibility with latest changes in main