#1202417 improvements