Merge "Fix INF-378 inventory subscription filter upgrade"