Merge branch 'feature/smm_store_search' into develop

This brings in Bob's work on the `opt_double_loop` branch.

Author: theurich