Merge "Removing TODO since bug is unfeasible." into main