[aquamar] enhanced product validation checks
Merge remote-tracking branch 'origin/4.11.x' into 4.11.x