Adding Luke's proposed changes

1 job for cr/ts_102232-3/038 in 7 seconds (queued for 1 second)
latest