Issue-1333/GH-1302: Update spec language to use SHOULD key word