Merge to Master

Fixed errors in file present after gui7 merge to Master