Nick Belaevski
committed
on 07 Sep 10
Reintegration from RF-7560 branch