#COP-117 fixed
#COP-113 in progress