merge branch JackSON into master