changes with F/R button event handling

changes with F/R button event handling
Merge branch 'John'