[#2854] Merged latest changes