Ticket #1461: Updating features again since they were mistakenly overwritten by some recent commit