SOC-4085 | Improvement code base and perfomance of feature notification.