Merged PLAN type changes into master