got return key working
Merge remote-tracking branch 'origin/eric' into bala