Merge "Fix bug that would prevent us from reserving right amount of space." into qt-dev