Merge branch 'bacra-dev' into bacra-master