ICT-10109, implemented directly on delivery branch
ICT-10109, implemented directly on delivery branch

git-svn-id: 7244387aa0af0a59283563c94d0131d7ca7baf67@247536 523d945c-050c-4681-91ec-863ad3bb968a

ACS-Community/ACS,ACS-Community/ACS,ACS-Community/ACS,ACS-Community/ACS,ACS-Community/ACS,ACS-Community/ACS,ACS-Community/ACS,ACS-Community/ACS