Merge "Release v2.5.1 docker containers"