Merge "Re-initialise quantiser after changing segment." into nextgenv2