Merge pull request #1254 from waleed-elmelegy-arm/merge-devel-to-resricted

Merge Public development into restricted