Merge proposals dependent on lp://qastaging/~gomyhr/arsenal/intel-fixes

lp://qastaging/~gomyhr/arsenal/intel-fixes has no merge proposals.