Fix iso build
Merge branch 'fix-sed' into test-iso