Merge branch 'honeycomb_branch' into tmp1