Merge "Fix crash due to incorrectly implemented assert"