fixed Product External Availability
merge with changes on remote master