Merge feature-gigya into develop