squash merge of mp decisionupdates from showp1984
update the test defconfig