Merge changes from archiso commit 2e9e57b5bd11d8b8a4840a708ee3dbd4791c2a62