Topic/js any restrictions 2.10

Fixes for 2.10 branch. Individual PR for 2.11 will follow.