Alex, can you link the bug(s) or patch set for your similar changes?