ECMS-5511: Tags are not well ordered
Merge remote-tracking branch 'origin/feature/stabilization' into feature/stabilization