R2004 version update
See merge request !34 (merged)
(cherry picked from commit 24aef906)
b0259c35 R2004 version update
