Merge pull request #5167 from mikeller/fix_dalrcf405