Add leap_check helper method, #3007 related issue.
Merge remote-tracking branch 'ivan/feature/add-leap-check' into develop