BAC-239: ImageServing code cleanup
BAC-239: ImageServing code cleanup
BAC-239: use meaningful constant instead of 0