Merge "API Credits proper ordering"