Incorporate suggestions from pull request.
Incorporate suggestions from pull request.

Solinea/goldstone-server,Solinea/goldstone-server,Solinea/goldstone-server,Solinea/goldstone-server,Solinea/goldstone-server