Review all uses of catch (Exception e) and rethrow in many cases.
ignore old folder
Merge remote-tracking branch 'upstream/develop' into develop