thermos-related refinement

Change-Id: I0e552c778d500b145c66c01522a68838e63591dd