[v3.4] #982 availability floor

Resolves #982 on `release-v3.4`