Development updates for 2.1.*

compatibility updates for packfire app for 2.1.*