Bug Fix #4150
Merge pull request #739 from omerjerk/QA_4_0

Bug Fix #4150