Merged platform changes from wa repo