Contributes to #814. This commit has not been tested for the two test cases with interacting disturbances.