merge

#CEP-137 fixed