manually merged sparkica-fea_ambassador