- Addressed review feedback; rebased against master This closes #2552. Signed-off-by: Bryan Bende <bbende@apache.org>