Merge "Update graphadmin to 1.0.4" into casablanca