XD-1622: Updates
XD-1622: Added test and javadoc