[BUG #8117] Refactoring