Update support library
Merge branch 'master' into custom_branding