Assorted bug fixes for May (rebased onto dev_4_4)

Same as gh-521, but rebased onto dev_4_4.