Syntax error after merging changes from 5.5.1