Merge pull request #1450 from MISL-EBU-System-SW/marvell-support-v6