first PR of xap-elastic