Merge changes for abstract bug