Merge "Remove INCREMENTAL_VERSION and add version to INCREMENTAL feature." into sc-dev