Merging in changes from pre-roll branch, adapting...