Merge remote-tracking branch 'origin/feature-andel-refractor'
Enhancement #8756: Refactoring, klient-side