Merge "MQ startup process refactor" into stable/fraser