Dev platform 308 porting changes