Merge "Fix docker build issue in cli"