Note 16.11.3 merge in changelog