Merge in changes made on demo branch.