Merge ""Fixing backwards cmpatibility for enabling explore by touch"""