[UNFINISHED] KOD-353 dependent pull requests