[SHARED-14] modified version control