Merge "Fixes for constant method handles"