[z2095] Related bg cleanups of previous commit

(based on commit [12139] - ba0b344)

(based on commit [s1714] - e1fe33c)