Completed implementation of the requirement 3.12.4.2