Merge Albinoman887's changes back to the bringup repo