[CORE-54] Single instance, not singleton pt 6