merge
initial for #CO-47
#CO-47 fixed
merge