updated to include KNIFE-267 and KNIFE-289