Content query complete
Merge remote-tracking branch 'origin/line_remodel'