Remerge with zelgerj/wick-ed changes