Merge branch 'feature/checkin-while-load'

latest commit f03fa9d10c
@thunsaker authored