The part here between --- REFACTOR BEGIN --- and --- REFACTOR END --- is not part of issue#115 and will be removed via issue#116