Re-applying changes on this branch after rebase. (189bbfb..b46ccfe)

Mainline app code somehow crept back in during my latest rebase.