Merged TigerZhang branch and fixed per owner subdir problem

Hi, maybe this time this will work for you.