OOIION-1262: Increment 3. Fix platform device edit / master