Merge pull request #4406 from jmarshallnz/thumb_fixes