Ok, I've pushed the change. Is METAGEN-86 really solved with this approach then? Or should we close it and create a new issue for correct approach which considers each PU for itself?