Merge branch 'av/wincred-with-at-in-username-fix'