Merge proposals dependent on lp://staging/~serpent-consulting-services/magentoerpconnect/gekko-tek-992750-1

1. gekko-tek-992750-1
2. Dependent merge proposals