Spacing between value and amount
Merge branch 'master' into 2-1-stable
Index friendly where