CALM-384 Feature + IT test done