[2854] Additional improvements to Uldaman