Con venus

DON'T MERGE

Temporary testing branch
Either that or we're use different solution - CON-1399 will give us answer.