Merge changes I67dbf04a,I032f6741

* changes:
  Settings: Disable failing assert
  Settings: Fix assertThat in test