Preparation for revision 07. With LW46 changes.