#2012 Extension for #5211 and #5311