Issue #1918566 by mkalkbrenner: fixed erroneous backport of multi environment devel integration