First step for 3.4 bring-up