Add option to only refresh on touch up
Merge branch 'development' into refresh-on-up
Merge branch 'refresh-on-up' into development