update changes to mdp_g18 repo