reverted to features 7.x-rc5