Merge changes from CatchPlus:master