Merging master branch to Altera branch