Eliminated STRICTS caused by mktime and static calls
Merge branch 'development' into dev/j2/common