Merge "Fixed TODO - kind of..." into pi-dev