Reset of develop branch for the new architecture