Merge "Add initialization and per frame flag members"