Merge with 0.81-RC5

Merge with 0.81-RC5