Hi Bruno. This code is part of a previous already accepted PR, not the one related with the custom truststore support. I will move it to another class and create a new refactoring PR. Do you agree?