applied 2.1.1.0 shuttle.core files