Merge "Fix all refstack-client requirements on-the-fly"