add no-image implementation
Merge with upstream and rebuild