updating version
Merge branch 'f_def_version' into develop