added_identifiers needs to be mutable. fix #2140 #2141
Merge branch 'refs/heads/develop'