Merge branch 0.4.x into main

The following commits are merged using 'ours' merge strategy.

629e220c2f39e9512abab642a178d87b28d69b6d Use Boolean field for OidcUserInfo.phoneNumberVerified