Merge "Swipe integration"