Merge "Fix distinguishing between stack-create and stack-update"