assert is strange
scripted update of code from master at 91e5832 assert is strange