Fixed conflict with nifhleim branch