Task#5059 - Workarround for performance and load improve
Task#5059b - Workarround for performance and load improve
Merge pull request #261 from emersonfaria/task5059b

Task5059b