Created attachment 86297 [details] [review] patch 2/2 apply these two patches independent of any others.