Merge "init: handle property messages asynchronously #2"