LPS-47049 export required beans as services where possible to avoid static references