I think one of the two commits you have pointed out could be an issue here.