Merge "[SDC] Update containers to 1.8.4"