Merge "Add docker clean macro"