Merge "Fix file extention for degorenko user"