update related to the merge of the lts-model branch