Updated list code to allow for x-full-list headers
Merge branch 'test' into dev