[flannel/f21] Initial commit to repo - resolves: #1165688