First merge develop and Feature/profile

First merge develop and Feature/profile