ISPN-2689 Polish javadocs and reintroduce original API for backwards compatibility