Merge latest changes from master to xs64bit including [CA-99780]