Merge remote-tracking branch 'naglis/turbo'