Issue [4623] : backport patch