Fixed while() expression syntax
Merge branch 'issue/3035' into 1.3.x