Resolve #3379812 "3x updates"

Joseph Olstadrequested to merge
issue/mfd-3379812:3379812-2x-updates into 3.x

For 3.x branch of #3379812

Edited by william roboly

Merge request reports