#2327 | ADT changes