Merge "isFormatSupported() cosmetic changes" into main