Merge pull request #13552 from lodr/bug-912510-non-zero-values

Bug 912510 - Removing non zero placeholders
(cherry picked from commit 1b5247170863865327ea31480bec5469a747d435)