Develop ja

Monster commit from JA-Team