UF-96 - Change branch of the repository - refactoring cont.