RAZ-1725
Merge branch 'Issue_1725' into develop
Update OpenBD