Merge branch 'master' into topic/interactive_barcoder