Merge "Restored methods to pre-java11 state"