[[ 6.7 DP 7 Merge ]] Transfer code change from legacy block