Aligning 1.5.x with master (the most as possible)