Merge "Enforce the contract laid out in Javadocs"