@ matt581
I was just thinking, I wonder if it was working fine before the 8.2.5 update for you? In that update, there was a bug fix in the template override file loader code.