Merge JFG-460 and JFG-488

testing