[#76253826] refactoring