Bug 916059: (PIN2 workflow) uplift to v1.2/koi