12 9 version

merge 12-9 branch into master