core-4154 added feedback and core-4313 fix file overwrite.