Merging from devel for push to prod

• jamie, michelle, stacy
• PR from @ascott1
• post demo day changes