R2004 version update
See merge request !51 (merged)
(cherry picked from commit e3e21c96)
45b91489 R2004 version update
