[EC/BR/JM] [60558302] refactor