mom-63 and mom-64 commits

Sent c/o Stephen Griffies