Merge remote-tracking branch 'Dineshs91/KontrTube-fix'