Merge pull request #1074 from mikedfunk/feature/all_flashdata

Feature/all flashdata