ZEN-6846 ZEN-8725 ZEN-8944 finished removing immediate