FIB custom dropdown
Merge with remote changes