Revert "Revert "Merge remote-tracking branch 'korpling/master' into flatquerybuilder""

This reverts commit 55b6ceda7fece0993184b70193df6d285f047e5e.
added a description for the advanced settings