[Fix #46518443]: Separate fields for firstname and lastname
Merge commit '5d5abc47c7fd3516eacfd1b78973fb121f6e85c4'