changes for patch YENLODEVSPRT-182 and YENLODEVSPRT-191