[#1659] merge fix