Finish i46 for Initialise database on request begin
Merge branch 'i46' into wip