Pre-integration listing
Merge code conflict