Merge remote-tracking branch 'origin/stable' into feature/14596-automated-tests-for-ASP-gui-on-stable