use change from devel branch
temporarily disable failing assertion