Merge branch 'stable' into bugfix/15838-asp-fix-non-blocking-issues+14596-automated-tests-for-ASP-gui-on-stable