squashing in preparation for PR submission
cherry pick conflict correction: 1
cherry pick conflict correction: 1a
delete some left over commented code
deleting blanks lines
sync hints and hints_PR branches