Merge "Move freeze trigger into processFreeze method" into main