Merge branch 'develop' into feat/190-cttc-generalize-service-database-management