Core: add changes from #1223 to dist files