Proxy deposit, phase one: refs #795, fixes #3815, #3816, #3821, #3822, #3819