Add select condition
#2

Kta-M wants to merge add_select_condition into master

We do not currently have an analysis of these two commits