Merge "Move the fully charged check to a later stage" into main