Update support

Hello,
 Please merge update support branch.
Thanks.

Sanya