Merge "Change related to log4j removal needed in models"