merging final-ui-6-12 manually