Fix all-in-one image
Merge branch 'fix-aio' into dev