Merge branch 'feature/popup_close_on_out_click' into develop