Merge "BUG-509: introduce Version concept"