Merge remote-tracking branch 'devel/uvcmetrics_more_sample_files'
Got boxfill setting test to work again
Merge branch 'vcs_fix_boxf_test' into devel