# Reverting [#31641] which breaks Notices (File Type error message not
displayed)
Merge remote-tracking branch 'origin/master'