#FEC-1659 #time 2h #comment added API support with backward compatibility