Sweeping !1336 from master to devel: [master] Fix filtering steps by filetype
BEGINRELEASENOTES
*Bookkeeping FIX: Fix filtering steps by filetype
ENDRELEASENOTES
BEGINRELEASENOTES
*Bookkeeping FIX: Fix filtering steps by filetype
ENDRELEASENOTES