3) In addition to merging the changes below, change trunk back to a regular