[#75443168] refactoring