merging Image changes and API doc