Merging itemwait fix to v1.55 and added some wait time and a different message when blocked by itemwait