Merge "Clear the volume cache for all inactive state transitions" into lmp-dev