[WFK2-600] - Merge.