Preparation for 1.6.1 update