Completed Iss52. Request merge branch 52  with 45

Originally Iss52 was an offshoot of branch Iss45.

52 has been completed. 52 needs to update 45 for 45 to be completed.