fix(1301): consumer-surface polish from the v1.4.0 review (#1308)