merge

#CEP-173 fixed