Unbreak and update to version 4.1 (added DDR4 support).
PR: 243468, 244696 Approved by: maintainer (avg)