Merge "msmnile_au_km4 : lunch combo changes"