Pr 2305: continuation of FIX backward compatibility was broken

This is a continuation of #2305