Feature/mini app See merge request !1410
Master See merge request !1349
gender See merge request !1239
