Merge "Docker update and POM fix"