Adapt to xap-elastic recipe
Merge branch 'gkorland-patch-1'