fixed #72684910
Merge branch 'developer/claralinos' into dev