Hotline #16864 broken emplacement modification

Merge request reports