7650
Merge branch 'v_platformspecific' into v_dev