Bug fix for historyLen problem after history deletion and history updation
Merge branch 'develop' into feature/flexForm