Revert "Merge remote-tracking branch 'origin/feature-WG-228' into feature-latest-sqa-ticket" See merge request !49
