Fix dependency order.
#MBL-10304
Merge branch 'develop' into topic-routing