Added stop event propagation on button.
Merge branch 'stop_event_propagation' into develop