Add feedback and correct some inconsistencies

Detected this files are 2.3.1 and server files are 2.3.5, need to
correct in next commit with tag to 2.3.5.