- hand-merge #485's test
add comment