Ticket 489 rebased

After rebasing and solving all conflict, I tried to push branch 'ticket_489' but github claimed 'Everything up-to-date'. So I copied the rebased 'ticket_489' to this new branch and pushed it.