Feature/67415098 authentication