part of #1136 and a small step toward resolving #744 Change-Id: I4e1602b37c40517a92cbab8fe4074d7e6a6a6964