Initial commit on branch feature3.