Manual copy of PR 204 created by BalBany