Revert "Merge remote-tracking branch 'origin/feature-wg-134' into feature-latest-sqa-ticket" See merge request !48