[#APOLLO-1780] Reinstated length check