This pull request is a follow-up to #402, which inadvertently made edits to the in-progress "profiles" branch. Due to conflicts, #402 was closed. Since closing #402, a separate branch (i....