Merge changes from master.   Add comments for
changes to handler for initial value control.