Change-Id: I63f5247a01683cff416847c1856a24997bf8605c Partially-implements: blueprint condition-pre-check