Slight fixes.

[branch: dev1.2.6]
Merge branch 'dev1.2' into beta