Update to commit af5309356bfa197d7a7ea09101c317f94e9b856b