MAASAUTO-17 latest modified code