Merge "Make manual suggestions synchronous/return result"