How to sort folders then filenames in Kodi 16.1?

Hi

I want files to display as
Folder A,B,C,D and after that the filenames A,B,C,D instead of
it currently being mixed like
Folder A, File A, File B, Folder B, Folder C, File C

Is there a commit in Kodi 17 or in SPMC that fix this?
It looks like it is sorted correctly in SPMC.