Merge branch 'acdc_support' into pull_april