Activation context within own factory
Merge from master