TUP-2141: review to fix some problems in case some components are used
in the project.