Merge branch 'master' into swipe-behaviour
merge branch 'swipe-behaviour' into dev