Work initially triggered in the investigation for CBSE-17090.
During the work we have been spotting additional issue in the Warmup area. All added to this epic.
Plus, under review for including here: