Merge "only add config create after activate is done"