@Singleton beans not found when discovery-mode is annotated

When application in discovery-mode = annotated, Weld does not identify beans with @Singleton. When they are annotated with @ApplicationScoped, they are found but instantiated twice in some cases. See WELD-1732