[image-rebase] fixes and features added