Merge "Fix of development docker-compose"