Release improvements 928

Fixes FLOC-974

Refs #928