Merge branch 'hotfix/01.02.02'
implements EventSubscriberInterface
Merge branch 'hotfix/01.02.03' into develop