Initial try on 2.11.0-M7
Added logging, imitating previous property search