merge

#CEP-198 fixed