Fix query if no item is available, don't do filtering
Change core to master
Merge branch 'master' into features/core-update-next-2

Conflicts:
	jasyproject.json