Merge "Refactor NSSLController updateSensitiveness method" into main