[#68231446] refactor