fix #563
fix #566
fix #568
fix #551
Marionette fix wro4j 02