Preparing to merge with development to reflect list adapter changes.