Merge "Fix build issues w/ jetpck drop" into main