pre-branch commit
pre-merge of the ransack branch