Merge remote-tracking branch 'origin/develop-currencies-into-database' into develop-currencies-into-database