platforms fix
Merge branch 'platforms fix' into cylon-redesign