Fixes related BAM release by Sinthuja + tenancy fixes by Suho + related regression fixes