Task#5059 - Workarround for performance and load improve
Task#5059b - Workarround for performance and load improve
Merge branch 'milan.20130201.02'