merge request #477