Initial commit of enabling support for client proxy of features