Partially-implements: blueprint better-reconfigure Change-Id: I3879b9339b54e1d063dd1c4673bac85ced333335