Merge remote-tracking branch 'ether/topic/undef_stash' into develop