New attempt to backport #2910 and #3023 to 70x

This time it should be cleaner. Be careful: #3023 has not been approved for 71x yet.