Update MagLev branch from master-1.9 to master