Merge "Remove TODO comment of fixed bug"