Merge "Enforce MSB dockers dependencies"