Upgrade/node18 master merge

Dominik Trojčák requested to merge upgrade/node18-master-merge into upgrade/node18 Aug 17, 2023