merge of JAVA-151