#732064 follow up by pwolanin: move lock system loading earlier to avoid stepping over it or attempting to use it before it is loaded