Update 4.0 plan for 4161.
Plan 4161 for 4.0.
Merge pull request #35 from rseanhall/4161

Update WIP for 4161