Refactor code to move from recently deprecated classes. Closes gh-5822
Attach a file by drag & drop or click to upload
