FOLLOWUP TICKET #315355 & #313392