Merge "Add defaults to identity-support-lib"