[[ Bug 14035 ]] Some code refinement