LLP64 changes
Merge remote-tracking branch 'remotes/origin/r3_64' into r3_64