merge of no major changes