Merge "Do not allow division by 0" into qt-qpr1-dev