changes after merge branch "feature/target"