Merge "TC/transit - fixed warning and build error"