Merge remote-tracking branch 'devel/vcs_fix_boxf_test'
Merge branch 'update_devel' into devel-master