quiet silly -Wnarrowing warnings
avoid warning
Merge branch 'master' into rel/auth-3.3