[#523] More improvements