CTS on Flow #1504