Minor updates

Minor updates from code plan and product additional code plan
Conflict

Confilct