Fix delete layers site assoc
Merge branch 'dev' into staging