Merge for Ashaman/Le Jingle

Merged for Ashaman and Le Jingle