[v4.0] #982 availability floor

Resolves #982 on `master` (ignore branch name); this needs to be verified locally since the changes were made on the GitHub website.