RT#8460 improvements