Merge "support policy execution counts in lifecycle"