Pefomance optimization
Merge remote-tracking branch 'origin/dev-SOA-2' into dev-SOA-2