update support pull request

Hello
Please merge update_support branch with master.

Best,
Sanya