local variable should be prefixed by $(DID) to avoid conflicts
Merge branch '3.2.x' of ITER Git Repository into 3.2.x