Add related/dependent fix for ALOY-1175