Merge "Add javadoc for trampoline restrictions" into sc-dev