Merge "Move identity check strings to framework" into main