Merge latest updates

Merge latest code commits from Graz's repo