Merge changes from topic "db/unsigned_long" into integration