Merge remote-tracking branch 'sourcefabric/devel' into apy-8-implement-x-filter