merge all from cr-main 1/8/13