Merge several fixed issues.

Merge several fixed issues.