Merge "bulk support application - initial proposal" into stable/lithium