[fix] 950 : restore and update compaction function & completes PR 985#994

Bl3f merged 2 commits into

maingetnao/nao:mainfrom

fix/950_compaction_restoredgetnao/nao:fix/950_compaction_restoredCopy head branch name to clipboard