Merge branch 'L3_master_device'