acu115916 fixes for right_site integration