Merge from zone117x payments issue