Iginore key folder
(cherry picked from commit 43552ba)
Merge remote-tracking branch 'origin/master'