FIxed #81616, improved #81440 and #79447