[DF-1858] Added changes for issue #8.