Merge "Fix resource ready state" into devel/master