R2004 version update
See merge request !10 (merged)
(cherry picked from commit 72647706)
4fe53c68 R2004 version update
