[DONT MERGE IT BEFORE NOVEMBER, 17+] Maya welcome

We need to wait @mergulhao send feedback to the participants before merge it