merge docker updates