Save work for TRN-135-Bug