Merge hotfix.false_is_true

fixed test case assertion so put it into master already.