Checkpoint Monday before user tests
Latest running version on COB3-6-PC1
merge with recent github version