[boost] merge of bugfixes still possible