PMO-2501: improved InitializingComponent