fix for identity file
Merge remote-tracking branch 'rt/master'