Resolved merge conflict for ab_doomsday branch