Merge "Bugfix from reordering frame probs patch" into experimental