preparation for client side implementation of [us#68]
preparation for client side implementation of [us#68]