JAL-857 merge from develop