Branch issue 129 platform changeset