Merged with Abdala dispensing changes