Merge "Addressing previous todo comments and feedback" into main