merge #527