Preparation for Framework version 2.19