Allen

Results 1 issues of Allen

Adding all these changes to ensure this demo still runs on 4.12+ cluster. Also tested on 4.13.