Parts of this are addressed by the fixes for #1075538 and #1097931. The rest of patch may be worth to consider as well as it would have prevented the two other bug filings.