* forward-port [17536]