merged from 1.3 branch
merged from 1.3 branch
disabled WADL
disabled WADL
added filter
bumped version