Merge "Stores serialized entity data to the extras" into qt-dev