Refs: #4059 Also, adjust corresponding unit and functional tests
Attach a file by drag & drop or click to upload
