Fixing wrong merge/committed files on release 5.2.10
release: 5.2.13