Merge branch 'kinetoskombi-globo-fix'