Pulling new changes, 2 features for 1.3 / 1.4 compatibility for test online