Lps 40533

Sorry for the delay, this one should be merged properly with the changes made to the background task executor.