Tags: [STAR-689]