NOJIRA: Merge changes to master into previously-modified rev1 (see PAHMA_1009)