Merge "Fix parcelling issue for certain fields." into qt-dev