Random and Repeat without duplicate plays "in a row"

Would it be possible to change the function when both random and repeat option are both selected so the same song won’t play twice in a row?

A possible example of a fix could be to create a random playlist. Then once that list has finished playing create a new random list for the repeat.

Using Volumio 2.0 RC2.