Merge branch '1053-reverb-reconfiguration-runtime-test' into 1053-reverb-reconfiguration-runtime-aeid-file-tests