See below issue comment.