Merge "Fix the issue in ImageWriter Builder class." into tm-dev