Field count not left aligned
Merge branch 'DDBNEXT-1165-IMR' into develop