[APPROVAL] INTERNAL pending/master/fix-eclipse-edt-drqs47839133 to master

Base commit: 33cfcae847bb941527d14c0292c98969e5e48032