[DF-1063] Recovered previous fix.
Merge pull request #215 from adebt/development-qa

[DF-1063] Recovered previous fix.