merge unichrome changes from branch