LERGO-154 - finished implementing feature.