re-apply tick fix
Merge branch 'hotfix/tick_clean_2'
Merge tag 'tick_clean_2' into develop

fix to calculate tick at journal create time