Merge "Fix wrong condition used to calculate clearAllShortTotalTranslation" into main