Merge branch 'milestone-proposed' into iteco
Revert 'Revert port allocation for boot with port compatibility'
Merge branch 'milestone-proposed' into iteco